Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts:
#	src/config/app.php
#	src/translations/ar/app.php
#	src/translations/cs/app.php
#	src/translations/da/app.php
#	src/translations/de-CH/app.php
#	src/translations/de/app.php
#	src/translations/en-GB/app.php
#	src/translations/es/app.php
#	src/translations/fa/app.php
#	src/translations/fr-CA/app.php
#	src/translations/fr/app.php
#	src/translations/he/app.php
#	src/translations/hu/app.php
#	src/translations/it/app.php
#	src/translations/ja/app.php
#	src/translations/ko/app.php
#	src/translations/nb/app.php
#	src/translations/nl/app.php
#	src/translations/pl/app.php
#	src/translations/pt/app.php
#	src/translations/ru/app.php
#	src/translations/sk/app.php
#	src/translations/sv/app.php
#	src/translations/th/app.php
#	src/translations/tr/app.php
#	src/translations/uk/app.php
#	src/translations/zh/app.php