Merge branch 'MDL-57734-master' of https://github.com/xow/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 27 Jun 2017 16:29:35 +0000 (18:29 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:46 +0000 (18:24 +0200)

Trivial merge