Merge branch 'MDL-59148-master-7' of git://github.com/andrewnicols/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 15:43:07 +0000 (17:43 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:50 +0000 (18:24 +0200)

Trivial merge