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