Merge branch 'MDL-61058-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 31 Jan 2018 20:04:08 +0000 (21:04 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:20 +0000 (10:33 +0800)

Trivial merge