Merge branch 'MDL-57362-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Mar 2017 13:27:10 +0000 (10:27 -0300)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Mar 2017 13:27:10 +0000 (10:27 -0300)

Trivial merge