Merge branch 'imac-work' into macbook-branch
Merge branch 'macbook-branch' of https://github.com/californiavol/amsvideo-dev into macbook-branch