Merge branch '0.12.x' of github.com:dasmoth/dalliance into 0.12.x
Merge branch '0.12.x'