Merge branch 'wip-MDL-53798-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 10:09:48 +0000 (11:09 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 10:09:48 +0000 (11:09 +0100)

Trivial merge