Merge branch 'wip-MDL-56120-master-v2' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Nov 2016 02:31:12 +0000 (10:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Nov 2016 02:31:12 +0000 (10:31 +0800)

Trivial merge