use source role instead of linking to svn
merge 3.4