Merge branch 'MDL-56938-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 10:26:52 +0000 (10:26 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 10:26:52 +0000 (10:26 +0000)

Trivial merge