Merge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:27:12 +0000 (12:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:27:12 +0000 (12:27 +0800)

Trivial merge