Merge "[automerger skipped] Merge changes from topic "wd-flags" into qt-dev...
Merge "[automerger skipped] Merge changes from topic "wd-flags" into qt-dev am: 28c538d2 am: 66cc14a8 -s ours am skip reason: change_id I7323dc65ec2957aeab128224864441bdf63c6f81 with SHA1 97d96c61 is in history"