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