Travis: Initiating build for commit '2d1e99e8291adcd58518988f2a8df6347e428e7c' on branch 'angularjs_websites_selector': Merge remote-tracking branch 'origin/master' into angularjs_websites_selector

Conflicts:
	plugins/Zeitgeist/templates/empty.twig