Merge heads

This commit is contained in:
Serhiy Storchaka 2017-01-12 19:42:44 +02:00
commit cb19aeb550