Merge branch 'MDL-57737-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:26:57 +0000 (09:26 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:26:57 +0000 (09:26 +0000)

Trivial merge