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