Test fix for http://forum.piwik.org/read.php?2,111784
Merge remote-tracking branch 'origin/master'