Merge "Prevent a crash when constructing NSSL." into qt-dev