Initial import from svn release
Merge current working files