Bump version

Change-Id: Ifecaca6860d75f2f834673dd655d6d0bfff06df3
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	.qmake.conf

Change-Id: I014c0a4779038dd5c193208513c99d88d8b14496
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev