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