Merge branch 'bartnijssen-dev_5.0' into dev_5.0
Merge pull request #151 from bartnijssen/dev_5.0

remove redistribute_during_storm.c