Merge branch 'jk/sha1dc'