Merge branch 'develop'

This commit is contained in:
Petr Korolev 2015-02-06 15:36:03 +02:00
commit 7af782d0b3