Merge branch 'MDL-61920_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 04:52:50 +0000 (12:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 04:52:50 +0000 (12:52 +0800)

Trivial merge