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