Merge branch 'master' into develop

* master:
Merge branch 'master' of github.com:tiw/state_machine

* 'master' of github.com:tiw/state_machine: