Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 05:37:33 +0000 (13:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 05:37:33 +0000 (13:37 +0800)

Trivial merge