Merge branch 'MDL-59173-master' of git://github.com/tobiasreischmann/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 11:27:43 +0000 (12:27 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 11:27:43 +0000 (12:27 +0100)

Trivial merge