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