Bump version

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

Conflicts:
	.qmake.conf

Change-Id: I4c0a9ad9d5e5a28f9faf572279344d86af69fb4c