Updates to marlow media2.
Merge branch 'master' of https://github.com/chirs/media2