Merge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Oct 2016 09:25:30 +0000 (10:25 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Oct 2016 09:25:30 +0000 (10:25 +0100)

Trivial merge