Merge branch 'MDL-59285-master' of git://github.com/lameze/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 13:22:10 +0000 (15:22 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:48 +0000 (18:24 +0200)

Trivial merge