Bump version

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

Conflicts:
	.qmake.conf

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

Change-Id: Idacb25616e545fe9126151599c3419017c5b0641