Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 26 Feb 2019 12:29:43 +0000 (15:29 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 26 Feb 2019 12:29:43 +0000 (15:29 +0300)

Trivial merge