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