Merge branch 'MDL-60806-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:23:42 +0000 (15:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:23:42 +0000 (15:23 +0800)

Trivial merge