manually mergin PR #551

This commit is contained in:
Serghey Rodin 2016-06-27 12:08:55 +03:00
commit a9d8332565
2 changed files with 263 additions and 725 deletions

File diff suppressed because it is too large Load diff