Merge pull request #539 from laanwj/qt2