Merge branch 'MDL-58936_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 10:45:17 +0000 (11:45 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 10:45:17 +0000 (11:45 +0100)

Trivial merge