Merge branch 'MDL-55188-master' of git://github.com/abgreeve/moodle