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