Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 20 Nov 2019 12:47:11 +0000 (15:47 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 20 Nov 2019 12:47:11 +0000 (15:47 +0300)

Trivial merge