Merge branch 'MDL-59362_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 15:21:54 +0000 (17:21 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:44 +0000 (18:24 +0200)

Trivial merge