Merge branch 'MDL-57645-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Mar 2017 15:42:07 +0000 (15:42 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Mar 2017 15:42:07 +0000 (15:42 +0000)

Trivial merge