Merge branch 'MDL-59158-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 27 Jun 2017 14:39:41 +0000 (16:39 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 27 Jun 2017 14:39:41 +0000 (16:39 +0200)

Trivial merge