Merge heads

This commit is contained in:
Serhiy Storchaka 2015-10-06 18:39:58 +03:00
commit 85a0e5f498

File diff suppressed because it is too large Load diff