Merge branch 'MDL-59011-master' of git://github.com/ankitagarwal/moodle