Merge branch 'MDL-56538-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 14:50:55 +0000 (15:50 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 14:50:55 +0000 (15:50 +0100)

Trivial merge