Merge "Remove leftover stopship comment line" into qt-dev