Merging from trunk

svn path=/branches/release/libs/type_erasure/; revision=84745