Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Nov 2017 04:18:21 +0000 (12:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Nov 2017 04:18:21 +0000 (12:18 +0800)

Trivial merge