Merge branch 'MDL-57361-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:07:47 +0000 (11:07 -0300)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:07:47 +0000 (11:07 -0300)

Trivial merge