Initial commit, converted from svn repository
Updated and merged.