Merge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2017 18:37:17 +0000 (19:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2017 18:37:17 +0000 (19:37 +0100)

Trivial merge