fresh copy of repository for proto v4 development
merged from trunk
merged from trunk