Merge branch 'MDL-56618-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 12:38:32 +0000 (12:38 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 12:38:32 +0000 (12:38 +0000)

Trivial merge