Merge pull request #633 from laanwj/qtrpcconflict