user avatar
Merge remote-tracking branch 'origin/stable' into dev
Simon Hausmann authored
Conflicts:
	.qmake.conf

Change-Id: Ia4376114da086f0e01c5e0833a222d5fb06e33fd
7c9cf1b1