Merge branch 'MDL-55866-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 00:29:45 +0000 (02:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 00:29:45 +0000 (02:29 +0200)

Trivial merge