fix #2390: NPE in status updater
Merge remote-tracking branch 'origin/release'