Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:15:03 +0000 (11:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:15:03 +0000 (11:15 +0800)

Trivial merge