Merge branch 'jc/bindiff'