19
Merge remote-tracking branch 'origin/master'

Conflicts:
	updatefiles/1027-updata.zip