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