Update crucible#1097

leftwo merged 3 commits intomasteroxidecomputer/propolis:masterfrom

alan/more-c-in-your-dietoxidecomputer/propolis:alan/more-c-in-your-dietCopy head branch name to clipboard