Initial commit (merge from svn)