Merge branch 'beamer-inheritance'