Merge branch 'MDL-56270-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 17:11:51 +0000 (19:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 17:11:51 +0000 (19:11 +0200)

Trivial merge