Merge branch 'MDL-56046_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 00:42:31 +0000 (02:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 00:42:31 +0000 (02:42 +0200)

Trivial merge