Merge changes from SVN 0.1 branch