Merge branch 'MDL-60197_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 Sep 2017 01:56:54 +0000 (09:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 26 Sep 2017 01:56:54 +0000 (09:56 +0800)

Trivial merge