Merge branch 'MDL-60945' of https://github.com/NeillM/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:31:16 +0000 (11:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:31:16 +0000 (11:31 +0800)

Trivial merge