Merge branch 'MDL-57270_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 12:04:16 +0000 (13:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 12:04:16 +0000 (13:04 +0100)

Trivial merge