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