fix parsing of two's complement
Merge branch 'master' into develop