Merge branch 'hlintala-tvc'
authorSergey M․ <dstftw@gmail.com>
Fri, 12 Jun 2015 10:29:10 +0000 (16:29 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 12 Jun 2015 10:29:10 +0000 (16:29 +0600)

Trivial merge