Change sig id matching to use 6 characters if available
Merge branch 'develop' into release-0.2