Merge pull request #1 from vcmi/develop

Merge upstream changes