Fix OS X warning.
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge pull request #1674 from ey6es/master

Fix OS X warning.