Merge branch 'MDL-60810_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:57:00 +0000 (15:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Nov 2017 07:57:00 +0000 (15:57 +0800)

Trivial merge