Merge branch 'MDL-56849-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Nov 2016 08:36:27 +0000 (08:36 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Nov 2016 08:36:27 +0000 (08:36 +0000)

Trivial merge