Merge remote-tracking branch 'jon/silence-generated'