Updates from trunk -- fixed crash with -server param
Authored by: watusimoto 2010-08-16
Parent: [r886]
Child: [r888]