Initial import from svn.
Bug fixes.
Bugfix.
Merge branch 'release/release_v1'