Travis: Initiating build for commit '16dc3a43a8c215041873e0540cd74967a1a0f18e' on branch 'angularjs': Merge remote-tracking branch 'origin/master' into angularjs

Conflicts:
	plugins/MultiSites/templates/getSitesInfo.twig