Merge pull request #1 from dsnopek/openucb-362

OPENUCB-362: Open Berkeley Media Feature
[Tested by Caroline](https://jira.berkeley.edu/browse/OPENUCB-362?focusedCommentId=214755&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-214755)
Merge branch 'master' into openucb-195