Merge remote branch 'tom/qtfix' into maint