Merge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Mar 2016 07:49:45 +0000 (15:49 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Mar 2016 07:49:45 +0000 (15:49 +0800)

Trivial merge