Upstream org changes
Do not load org-beamer, it is obsolete
Upstream org changes