Merge branch 'develop' into oembed_provider