ML fixed, hopefully
ML-2D fix merged into movie_mode branch

Merge branch 'master' into movie_mode