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