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