Merge branch 'MDL-55859-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 10:02:33 +0000 (07:02 -0300)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 10:02:33 +0000 (07:02 -0300)

Trivial merge