updated to c21da5da7834641b6c0caa9d0747a9efb2611fb7@master (counterpartyd)