Merge pull request #542 from laanwj/qt2