Migrated from unibe SVN
Merge branch 'release/3.0.2'