Merge branch 'master_MDL-57324' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 01:01:56 +0000 (02:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 01:01:56 +0000 (02:01 +0100)

Trivial merge