Merge branch 'MDL-51745-master' of https://github.com/jebarviabb/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 06:47:31 +0000 (14:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 06:47:31 +0000 (14:47 +0800)

Trivial merge