Bump version

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

Conflicts:
	.qmake.conf

Change-Id: I792cdcb53c271d64f58cd25e6541665daa6efcac