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

Trivial merge