Merge pull request #521 from laanwj/qt