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