Merge branch 'oembed_provider' into 'develop'