upstream master#1167

Eldinnie wants to merge 16 commits intopython-telegram-bot:masterpython-telegram-bot/python-telegram-bot:masterfrom

Eldinnie:masterEldinnie/python-telegram-bot:masterCopy head branch name to clipboard