merge pull #1499
Merge branch 'master' of https://github.com/worklist/hifi into fixery