Travis: Initiating build for commit '02547bcb2b8b2949f396b2cf9497e96e53279fbd' on branch '3490_user_id': Merge branch 'master' into 3490_user_id

Conflicts:
	core/Version.php
	misc/package/build.sh