Merge branch 'master' and update deckard

We need this to fix the tests.

diff --cc lib/utils.c
Simple merge

diff --cc lib/utils.h
Simple merge

diff --cc tests/deckard
index b96ef5cd589ddb71eefb89e09fee1087a49edf35,5b47a6b1adb2bad6eedec8a07dacbe6b673aa28d..b985a91d0e5f2f30d430d3fb4823f20f78661c70
--- 1/tests/deckard
--- 2/tests/deckard
+++ b/tests/deckard
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit b96ef5cd589ddb71eefb89e09fee1087a49edf35
 -Subproject commit 5b47a6b1adb2bad6eedec8a07dacbe6b673aa28d
++Subproject commit b985a91d0e5f2f30d430d3fb4823f20f78661c70