Merge branch 'MDL-57999_2' of https://github.com/zoebogner/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:12:32 +0000 (11:12 -0300)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 14:12:32 +0000 (11:12 -0300)

Trivial merge