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