Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 10:23:28 +0000 (10:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 10:23:28 +0000 (10:23 +0000)

Trivial merge