Merging from trunk

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