Fix fixture for cases when another fixture extends this one
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
	Merge branch 'master' of github.com:piwik/piwik