Bump version

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

Conflicts:
	.qmake.conf

Change-Id: Ia2ad5d124b5ade98463e2304a96458d5d9fb9a59