Merge svn 427 (Release 0.6.11)