Merge branch 'MDL-61250-master' of https://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Jan 2018 03:19:18 +0000 (11:19 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:14 +0000 (10:33 +0800)

Trivial merge