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