Mantis#0002245 & Mantis#0002243

git-svn-id: http://farmanager.com/svn/trunk@9302 72235d2c-c60c-0410-a47a-a0032694dc5d