merge with svn r171