Merge branch 'MDL-36696-MOODLE_23_STABLE' of git://github.com/mrverrall/moodle into...