Merge branch 'MDL-54745_master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 21:13:25 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 21:13:25 +0000 (23:13 +0200)

Trivial merge