Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 06:39:32 +0000 (14:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 06:39:32 +0000 (14:39 +0800)

Trivial merge