Merge branch 'MDL-55316-master' of https://github.com/mrmark/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:01:46 +0000 (17:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:01:46 +0000 (17:01 +0200)

Trivial merge