Merge branch 'MDL-60784' of git://github.com/stronk7/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 Nov 2017 02:37:37 +0000 (10:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 Nov 2017 02:37:37 +0000 (10:37 +0800)

Trivial merge