Merge branch 'MDL-57321-master' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Mar 2017 23:00:37 +0000 (00:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Mar 2017 23:00:37 +0000 (00:00 +0100)

Trivial merge