Merge branch 'MDL-60880-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Dec 2017 08:18:28 +0000 (16:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Dec 2017 08:18:28 +0000 (16:18 +0800)

Trivial merge