Merge branch 'new-features'

This commit is contained in:
Petr Korolev
2014-11-10 14:15:53 +02:00