Merge commit 'f81cba9cdbcb398880133a9ac89b824d2e0ac7a8' into bugfix
Merge branch 'develop' into bugfix
Bugfix for #359 – 2nd try
Reworked fix for #359
Reworked fix for #359
Merge branch 'bugfix' of https://github.com/Jako/evolution into bugfix
Reworked fix for #359
Merge branch 'bugfix' into develop