Merge branch 'MDL-59172-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Aug 2017 15:20:11 +0000 (16:20 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Aug 2017 15:20:11 +0000 (16:20 +0100)

Trivial merge