Merge "Really fix excessive 'trun' box parsing" into qt-qpr1-dev