Merge branch 'development' into chains
Merge branch 'chains' of github.com:glennhickey/hal into chains