Merge branch 'MDL-64171-36' of git://github.com/bmbrands/moodle into MOODLE_36_STABLE