Merge pull request #2 from TelegramMessenger/master merge7.1.1
Merge pull request #1 from TelegramMessenger/master merge 7.0.1