Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle