Bump version

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

Conflicts:
	.qmake.conf

Change-Id: Idc42f077fca0721dca29de4a8077b2ca84bc7884