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