manual merge of https://github.com/23d/oembed/commit/0f4b7829a4368dedb145a2fa58590f2625ee83f4
manual merge of https://github.com/23d/oembed/commit/0f4b7829a4368dedb145a2fa58590f2625ee83f4

MeteorMag/oembed,iamcal/oembed,iamcal/oembed,MeteorMag/oembed,iamcal/oembed,iamcal/oembed