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