Merge branch 'MDL-55391-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 23 Aug 2016 05:24:29 +0000 (13:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 23 Aug 2016 05:24:29 +0000 (13:24 +0800)

Trivial merge