Merge "Cosmetics" into qt-dev