Merge branch 'master' into contentmodels

One more commit that needs to be merged into master.