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