Merge branch 'pr/436'

This commit is contained in:
Igor Zhukov 2014-09-08 14:14:09 +04:00
commit 117b2cba3d

File diff suppressed because one or more lines are too long