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