Merge branch 'wip-MDL-52285-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Dec 2015 10:13:40 +0000 (10:13 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Dec 2015 10:13:40 +0000 (10:13 +0000)

Trivial merge