Travis: Initiating build for commit 'e1d0478e4f8093920edfc67fac895d0f54c065ea' on branch 'uiunittests': Updating UI submodule (diagnosing travis failure).
Diagnosing travis failure. [ci skip]
Travis: Initiating build for commit 'c144bf4aba5dc72958b1743aa6d99ee7204f94b1' on branch 'uiunittests': Fix bug in last commit.
Get build to run for uiunittests branch. [ci skip]
Merge branch 'master' into uiunittests

Conflicts:
	getpiwik.sh