Merge branch 'MDL-58795-master' of https://github.com/jebarviabb/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 May 2017 22:59:36 +0000 (06:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 May 2017 22:59:36 +0000 (06:59 +0800)

Trivial merge