Merge branch 'zx8-master'
authorSergey M․ <dstftw@gmail.com>
Thu, 26 Mar 2015 17:57:56 +0000 (23:57 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 26 Mar 2015 17:57:56 +0000 (23:57 +0600)

Trivial merge