Travis: Initiating build for commit 'f3805e8155dd57e3891738b88ebd8ad4e83d6d7b' on branch 'master': Merge branch 'master' into about_piwik_page_experiment

Conflicts:
	lang/en.json