Merge branch 'MDL-56433-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 09:33:28 +0000 (09:33 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 09:33:28 +0000 (09:33 +0000)

Trivial merge