Merge branch 'MDL-59171-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Jun 2017 13:40:06 +0000 (14:40 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:36:39 +0000 (12:36 +0100)

Trivial merge