Merge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:22:25 +0000 (08:22 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:22:25 +0000 (08:22 +0000)

Trivial merge