Bump version

Change-Id: Idc22f4e16ba0977a48a1c29be380f999dc972f8d
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf

Change-Id: I24c15b9824a6a2a68d1cb3d0aef0650e024164d6