Merging from trunk

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