Merge branch 'mm-video-support' into s2
Merge branch 'mm-video-support' into s2
remove .gitignore in preparation for merge
subtree merged in core-hq (s2 branch)
Merge branch 'master' into core-hq-s2