Merge pull request #2031 from Atlante45/fix_import

Fix import
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import