Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 Nov 2017 06:11:50 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 Nov 2017 06:11:50 +0000 (14:11 +0800)

Trivial merge