#SEER-81
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #1118 from Tendrid/develop

Error state for state machine