Merge branch 'MDL-57527-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Feb 2017 23:52:03 +0000 (00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Feb 2017 23:52:03 +0000 (00:52 +0100)

Trivial merge