Merge branch 'MDL-60579-master-fix2' of https://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 9 Nov 2017 03:18:14 +0000 (11:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 9 Nov 2017 03:18:14 +0000 (11:18 +0800)

Trivial merge