Commits

Lars Knoll committed 11024621308M
Merge remote-tracking branch 'origin/master' into qt5 Change-Id: I5ee4f3e628f929642b71afaf4d70a00d057834a3
Merge remote-tracking branch 'origin/master' into qt5 Change-Id: I5ee4f3e628f929642b71afaf4d70a00d057834a3