Merge branch 'atomicdryad-pr-fix_bbc_mediaselector'