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