Merge branch 'MDL-48089-master' of git://github.com/danpoltawski/moodle