Merge pull request #29630 from florianjacob/piwik-3.1.1
piwik: 3.1.0 -> 3.1.1
authored by Jörg Thalheim and committed by GitHub 8 years ago 677371c5 570c0b3a