Merge branch 'wip-MDL-50323-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Sep 2015 08:14:14 +0000 (09:14 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Sep 2015 08:14:14 +0000 (09:14 +0100)

Trivial merge