Merge pull request #6274
02a6702 Add option -alerts to opt out of alert system (Wladimir J. van der Laan)