Updating submodules
Merge branch 'master' of https://github.com/piwik/piwik
rewrite the expected/* files once they are cleaned up
Minor
Merge remote-tracking branch 'origin/master'
Tests: re-enabling old test which was disabled "temporarily" months ago. + Removing one hack + refreshing the expected files
Merge remote-tracking branch 'origin/master'