merge pull request 1446
merge again after some competing pull requests were processed
yet another merge after competing pull requests
Merge branch 'master' of https://github.com/worklist/hifi into fixery