[m] Should fix 1010380 and 1010379 in coverity
Merge branch 'master' of github.com:mangoszero/server