Merge branch 'MDL-59832_master-v2' of git://github.com/markn86/moodle