Merge remote-tracking branch 'upstream/master'

...ebutton/freeswitch/voice/freeswitch/ESLEventListener.java

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js

bigbluebutton-html5/imports/startup/client/intl.jsx

bigbluebutton-html5/imports/startup/client/logger.js

bigbluebutton-html5/private/config/settings.yml

bigbluebutton-html5/private/locales/ar.json

bigbluebutton-html5/private/locales/de.json

bigbluebutton-html5/private/locales/es.json

bigbluebutton-html5/private/locales/es_MX.json

bigbluebutton-html5/private/locales/eu.json

bigbluebutton-html5/private/locales/fa_IR.json

bigbluebutton-html5/private/locales/fi.json

bigbluebutton-html5/private/locales/fr.json

bigbluebutton-html5/private/locales/hi_IN.json

bigbluebutton-html5/private/locales/hu_HU.json

bigbluebutton-html5/private/locales/it_IT.json

bigbluebutton-html5/private/locales/ja.json

bigbluebutton-html5/private/locales/ja_JP.json

bigbluebutton-html5/private/locales/km.json

bigbluebutton-html5/private/locales/ko_KR.json