Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Dec 2017 04:51:33 +0000 (12:51 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Dec 2017 04:51:33 +0000 (12:51 +0800)

Trivial merge