Merge branch 'atomicdryad-brightcove_custombc_extractor'