Merge "Align qt-dev and master" into qt-dev