Travis: Initiating build for commit 'e00732e1ea29900860671a5b022d4450377776f2' on branch 'tmp-path': Merge branch 'master' into tmp-path

Conflicts:
	plugins/Installation/SystemCheck.php