Merge branch 'MDL-60773-master' of https://github.com/snake/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 17 Nov 2017 06:11:12 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 17 Nov 2017 06:11:12 +0000 (14:11 +0800)

Trivial merge