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