Merge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:38:11 +0000 (12:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:38:11 +0000 (12:38 +0800)

Trivial merge