Merge branch 'MDL-57125-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 16:34:52 +0000 (16:34 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 16:34:52 +0000 (16:34 +0000)

Trivial merge