Merge branch 'wip-MDL-4782-fix' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Feb 2017 07:51:02 +0000 (07:51 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Feb 2017 07:51:02 +0000 (07:51 +0000)

Trivial merge