Merge pull request #1594 from ey6es/master

Compile fixes (perhaps just for my version of Qt/GCC).
Merge branch 'master' of https://github.com/highfidelity/hifi