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