Merge branch 'wip-mdl-54987' of https://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 27 Jul 2016 05:17:33 +0000 (13:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Jul 2016 05:17:33 +0000 (13:17 +0800)

Trivial merge