Merge branch 'MDL-56459-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Dec 2016 15:48:27 +0000 (15:48 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Dec 2016 15:48:27 +0000 (15:48 +0000)

Trivial merge