Merge branch 'MDL-55325-master' of https://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Jul 2016 02:33:21 +0000 (10:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Jul 2016 02:33:21 +0000 (10:33 +0800)

Trivial merge