Merge branch 'MDL-57193-master-notest' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 2 Dec 2016 10:41:02 +0000 (11:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 2 Dec 2016 10:41:02 +0000 (11:41 +0100)

Trivial merge