Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb