Bump version

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

Conflicts:
	.qmake.conf

Change-Id: Ibcd05d8dcf19133830920d9eba3fa1450b3d3de1