Merge branch 'MDL-59801-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 31 Aug 2017 06:12:31 +0000 (14:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 31 Aug 2017 06:12:31 +0000 (14:12 +0800)

Trivial merge