Travis: Initiating build for commit 'a6474178f9a770d56754636345082a3cc698eeb8' on branch '4996_content_tracking': Merge branch 'master' into 4996_content_tracking

Conflicts:
	js/piwik.js