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