Merge branch 'MDL-58121-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 13:15:07 +0000 (13:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 13:15:07 +0000 (13:15 +0000)

Trivial merge