Merge branch 'wip-MDL-50795-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Sat, 26 Mar 2016 01:31:54 +0000 (09:31 +0800)
committerDan Poltawski <dan@moodle.com>
Sat, 26 Mar 2016 01:31:54 +0000 (09:31 +0800)

Trivial merge