Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 13 Dec 2017 03:30:46 +0000 (11:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 13 Dec 2017 03:30:46 +0000 (11:30 +0800)

Trivial merge