Merge branch 'wip-MDL-44952-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:30:56 +0000 (12:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:30:56 +0000 (12:30 +0800)

Trivial merge