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