Add DISASTER threshold on disk space
Merge remote-tracking branch 'upstream/master'