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