Bump version

Change-Id: Ie22937bab88b96f5d60509eb956a794a983b4c63
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	.qmake.conf

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

Change-Id: I92b5fcb258f0277e7d570d4bb9fc45627792aa1e