Merge SVN  431 (Release 0.6.12)