Merge pull request #6967
9ea7762 Use Pieter's signing subkey instead of his primary key (Matt Corallo)