Merge pull request #2696 from anovicecodemonkey/support-ustream-embeds