Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2015-04-26 19:23:57 +01:00
File diff suppressed because it is too large Load Diff