Merge branch 'MDL-56184-master-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 26 Oct 2016 11:11:56 +0000 (12:11 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Oct 2016 11:11:56 +0000 (12:11 +0100)

Trivial merge