Merge branch 'MDL-60564_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 26 Oct 2017 06:43:39 +0000 (14:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 26 Oct 2017 06:43:39 +0000 (14:43 +0800)

Trivial merge