Merge branch 'MDL-56192-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Oct 2016 15:16:17 +0000 (16:16 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Oct 2016 15:16:17 +0000 (16:16 +0100)

Trivial merge