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