Merge branch 'svost-patch'
authorCryptoManiac <balthazar@yandex.ru>
Sat, 5 Mar 2016 17:46:14 +0000 (20:46 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Sat, 5 Mar 2016 17:46:14 +0000 (20:46 +0300)

Trivial merge