Merge branch 'MDL-57374_master' of https://github.com/dasistwas/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:10:44 +0000 (12:10 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:10:44 +0000 (12:10 +0000)

Trivial merge