Merge branch 'MDL-60041' of https://github.com/NeillM/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 01:13:43 +0000 (09:13 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 01:13:43 +0000 (09:13 +0800)

Trivial merge