Merge branch 'MDL-56823' of git://github.com/aolley/moodle