Merge branch 'wip-MDL-34859-fix' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 22 Mar 2017 08:52:57 +0000 (08:52 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Mar 2017 08:52:57 +0000 (08:52 +0000)

Trivial merge