Updated to SVN r1677