Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 13 Apr 2016 01:51:35 +0000 (09:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 13 Apr 2016 01:51:35 +0000 (09:51 +0800)

Trivial merge