Catch when setting poster/preview for live.
Merge branch 'master' into squares