Merge branch 'develop' of https://github.com/cgoodrich/relistate into develop