Merge svn 423 (Release 0.6.10)