Merge branch 'MDL-44667-master' of https://github.com/snake/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 02:26:08 +0000 (10:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 02:26:08 +0000 (10:26 +0800)

Trivial merge