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