Merge branch 'MDL-57477' of https://github.com/appalachianstate/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Oct 2017 00:04:54 +0000 (08:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Oct 2017 00:04:54 +0000 (08:04 +0800)

Trivial merge