Merge branch 'MDL-59101-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Jun 2017 15:25:58 +0000 (16:25 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Jun 2017 15:25:58 +0000 (16:25 +0100)

Trivial merge