Merge pull request #4838 from phomes/misc-cleanup2
authorEvgeny Vereshchagin <evvers@ya.ru>
Tue, 6 Dec 2016 03:51:55 +0000 (06:51 +0300)
committerGitHub <noreply@github.com>
Tue, 6 Dec 2016 03:51:55 +0000 (06:51 +0300)
Misc cleanups


Trivial merge