Merge branch 'wip-MDL-38105-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 31 Aug 2016 01:57:31 +0000 (09:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 31 Aug 2016 01:57:31 +0000 (09:57 +0800)

Trivial merge