[0.0.3m] minor project sync
Merge branch 'master' of http://github.com/mangosvb/serverZero