Merge pull request #1128 from mc-server/master

Coverity merge
Merge pull request #1145 from mc-server/master

coverity scan
Merge pull request #1173 from mc-server/master

Coverity merge
Merge pull request #1229 from mc-server/master

Merge master into coverity_scan
Merge branch 'master' into coverity_scan
Merge branch 'coverity_scan' of http://github.com/mc-server/MCServer into coverity_scan