Merge branch 'release/0.1.3'
Merge branch 'release/0.2.0'
Bugfix in default/validation phase of save
Merge branch 'master' into develop