Merge branch 'wip-MDL-41809-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Apr 2017 02:43:41 +0000 (10:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Apr 2017 02:43:41 +0000 (10:43 +0800)

Trivial merge