Merge remote-tracking branch 'refs/remotes/origin/OpenAPI.next' into dm/content-type-rename

# Conflicts:
#	versions/3.0.md