Merge branch 'MDL-59093-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 31 May 2017 10:09:06 +0000 (11:09 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 31 May 2017 10:09:06 +0000 (11:09 +0100)

Trivial merge