amoeba
Merge branch 'master' into restartreporter
Bugfix the new restartreporter