merge 1.0.2

git-svn-id: https://plugins.svn.wordpress.org/advanced-custom-fields-oembed-field/trunk@937862 b8457f37-d9ea-0310-8a92-e5e31aec5664