Merge "remove [email protected]" into qt-qpr1-dev