fix premature shutdown
Merge remote-tracking branch 'origin/JeffBranch' into RobBranch