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