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