Merge branch 'hotfix/20140523-gamerp'
mogera
Merge branch 'hotfix/20140523-mogera' into develop