Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:49:46 +0000 (12:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:49:46 +0000 (12:49 +0800)

Trivial merge