Merge branch 'MDL-60188-master' of git://github.com/rezaies/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 27 Nov 2017 07:57:41 +0000 (15:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 27 Nov 2017 07:57:41 +0000 (15:57 +0800)

Trivial merge