Merge origin/master

Conflicts:
	buildnumber.properties