Merge branch 'MDL-61305-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 00:17:49 +0000 (08:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 00:17:49 +0000 (08:17 +0800)

Trivial merge