Fix for crash that Philip was seeing.
Merge pull request #1370 from ey6es/master

Fix for crash that Philip was seeing.
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
Working on polymorphic attributes, average -> merge.