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