merging latest from svn back to github