Update for new trusted patterns
Merge branch 'master' into crypto