Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 11 Dec 2015 08:57:57 +0000 (08:57 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Dec 2015 08:57:57 +0000 (08:57 +0000)

Trivial merge