Merge branch 'MDL-60669-master' of git://github.com/tobiasreischmann/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 04:05:21 +0000 (12:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 04:05:21 +0000 (12:05 +0800)

Trivial merge