Merge branch 'MDL-55499-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 16:23:02 +0000 (18:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 16:23:02 +0000 (18:23 +0200)

Trivial merge