Merge branch 'MDL-55725-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 15:54:59 +0000 (17:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 15:54:59 +0000 (17:54 +0200)

Trivial merge