Merge branch 'master' of https://github.com/chris-genesi/vpu_test

Merged commits from home and workstation