Merge branch 'MDL-60767-master-3' of https://github.com/snake/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Dec 2017 03:12:47 +0000 (11:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Dec 2017 03:12:47 +0000 (11:12 +0800)

Trivial merge