Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 21 Sep 2016 12:57:08 +0000 (15:57 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 21 Sep 2016 12:57:08 +0000 (15:57 +0300)

Trivial merge