Merge branch 'MDL-60078-master' of https://github.com/nashtechdev01/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 03:08:19 +0000 (11:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 03:08:19 +0000 (11:08 +0800)

Trivial merge