Merge "Fix crash." into qt-dev