Travis: Initiating build for commit '548c958b16fbb1acd2e08f306742efeed36016bf' on branch 'master': Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/Installation/ServerFilesGenerator.php