Merge branch 'MDL-61265-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Mar 2018 02:51:27 +0000 (10:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Mar 2018 02:51:27 +0000 (10:51 +0800)

Trivial merge