Merge branch 'MDL-56627-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:54:22 +0000 (15:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:54:22 +0000 (15:54 +0000)

Trivial merge