Merge branch 'MDL-58985-master-bluebubbles' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 22:45:07 +0000 (00:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jun 2017 22:45:07 +0000 (00:45 +0200)

Trivial merge