Merge remote-tracking branch 'origin/upstream'

.hgtags

src/clientobject.cpp

src/content_cao.cpp

src/content_sao.cpp

src/serverobject.cpp