Merge pull request #854 from laanwj/2012_02_qtipc