Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 06:54:46 +0000 (14:54 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 06:54:46 +0000 (14:54 +0800)

Trivial merge