Merge branch 'MDL-54866-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 14:50:44 +0000 (15:50 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 14:50:44 +0000 (15:50 +0100)

Trivial merge