merged from trunk

svn path=/branches/proto/v4/tools/inspect/; revision=45230
merged from trunk

svn path=/branches/proto/v4/tools/inspect/; revision=45844
merged from trunk

svn path=/branches/proto/v4/tools/inspect/; revision=46303
merged from trunk

svn path=/branches/proto/v4/tools/inspect/; revision=47983
merged from trunk

svn path=/branches/proto/v4/tools/inspect/; revision=48605
merged from trunk

svn path=/branches/proto/v4/tools/inspect/; revision=49133
merged from trunk

svn path=/branches/proto/v4/tools/inspect/; revision=49439
merged from trunk

svn path=/branches/proto/v4/tools/inspect/; revision=49607