Syncing w/ Upstream Changes

https://github.com/pronamic/wt-orbis/commit/5385913323c9cbb1b909afdf4c81
c362a736b87f