Merge branch 'MDL-56045-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 11:24:59 +0000 (12:24 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 11:24:59 +0000 (12:24 +0100)

Trivial merge