Merge branch 'MDL-61196_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Mar 2018 01:34:24 +0000 (09:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Mar 2018 01:34:24 +0000 (09:34 +0800)

Trivial merge