Merge branch 'master' of https://github.com/ConnorSheremeta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 Sep 2017 00:16:08 +0000 (08:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 Sep 2017 00:16:08 +0000 (08:16 +0800)

Trivial merge