Merge branch 'MDL-42434-master' of git://github.com/sarjona/moodle