Merge branch 'pr-fix_bbc_mediaselector' of https://github.com/atomicdryad/youtube...