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

Change-Id: I6e1ef2cfdde5dc34d6971bfd6ed89c6102daf679
68a98516