Merge movie-views into master