Merge branch 'MDL-55982-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Sep 2016 01:04:36 +0000 (03:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Sep 2016 01:04:36 +0000 (03:04 +0200)

Trivial merge