Merge fix.
Merge pull request #1104 from ey6es/master

Merge fix.
Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode