Merged fixes from the branch.

git-svn-id: http://svn.code.sf.net/p/vcmi/code/trunk/@3559 4dfc6b2a-8b31-0410-aa91-d6c70e3ac834