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

Trivial merge