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