Merge branch 'wip-MDL-55425-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 09:58:40 +0000 (10:58 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 09:58:40 +0000 (10:58 +0100)

Trivial merge