Merge branch 'MDL-55326-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 17:01:57 +0000 (19:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 17:01:57 +0000 (19:01 +0200)

Trivial merge