Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 04:52:23 +0000 (12:52 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 04:52:23 +0000 (12:52 +0800)

Trivial merge