Fix for Qt 5.2 beta
Merge branch 'master' of https://github.com/worklist/hifi into 19418
Merge branch 'master' of https://github.com/worklist/hifi into 19418
Merge pull request #1296 from stojce/19418

Code review for #19418