Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 23:16:53 +0000 (00:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Jan 2017 00:10:45 +0000 (01:10 +0100)

Trivial merge