Merge branch 'MDL-56511-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 01:35:29 +0000 (09:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 01:35:29 +0000 (09:35 +0800)

Trivial merge