fixed setup states for quit during setup; (should) fix #632
Merge remote-tracking branch 'origin/master'