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