Merge branch 'MDL-55133-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 11:16:27 +0000 (13:16 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 11:16:27 +0000 (13:16 +0200)

Trivial merge