Merge branch 'MDL-60749-master' of git://github.com/sarjona/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 04:05:46 +0000 (12:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 04:05:46 +0000 (12:05 +0800)

Trivial merge