Update to qbs upstream