Merge branch 'MDL-61305-master-fix' of https://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 03:30:53 +0000 (11:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 03:30:53 +0000 (11:30 +0800)

Trivial merge