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