Merge pull request #15061 from AsyaPronina:dev/fix_merge_issue
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 16 Jul 2019 18:00:50 +0000 (21:00 +0300)
committerGitHub <noreply@github.com>
Tue, 16 Jul 2019 18:00:50 +0000 (21:00 +0300)

Trivial merge