svn revision 313 merged