Merge branch 'fixes-multimedia' into gh-pages