Merge pull request #571 from ey6es/opencv

Quick fix for something I broke in mouse/touch took.
Merge branch 'master' of https://github.com/worklist/hifi into opencv