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