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

Change-Id: Ib695c2e2c8629e1947c24ba6510ecb4194b949dc
b87b74fb