Merge remote-tracking branch 'upstream/master' into binning-strategies

README.md

bin/aws-eb-docker/.ebextensions/01_metabase.config

...eb-docker/.ebextensions/metabase_config/metabase-setup.sh

docs/README.md

docs/administration-guide/01-managing-databases.md

docs/administration-guide/02-setting-up-email.md

docs/administration-guide/05-setting-permissions.md

docs/administration-guide/06-collections.md

docs/administration-guide/11-getting-started-guide.md

docs/developers-guide.md

docs/faq.md

docs/operations-guide/running-metabase-on-heroku.md

docs/troubleshooting-guide/bugs.md

docs/troubleshooting-guide/datawarehouse.md

docs/troubleshooting-guide/docker.md

docs/troubleshooting-guide/email.md

docs/troubleshooting-guide/images/ServerLogs.png

docs/troubleshooting-guide/index.md

docs/troubleshooting-guide/installing.md

docs/troubleshooting-guide/loggingin.md