Merge remote-tracking branch 'origin/develop' into new-avatar-storage-types

HISTORY.md

packages/rocketchat-i18n/i18n/en.i18n.json

packages/rocketchat-internal-hubot/hubot.coffee

packages/rocketchat-internal-hubot/hubot.js

packages/rocketchat-internal-hubot/package.js

packages/rocketchat-internal-hubot/scripts/maps.coffee

packages/rocketchat-internal-hubot/scripts/pugme.coffee

packages/rocketchat-internal-hubot/settings.coffee

packages/rocketchat-internal-hubot/settings.js

server/startup/migrations/v096.js

server/startup/migrations/v097.js