Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 05:47:05 +0000 (13:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 05:47:05 +0000 (13:47 +0800)

Trivial merge