Merge branch 'MDL-59827-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 07:14:20 +0000 (15:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 07:14:20 +0000 (15:14 +0800)

Trivial merge