Merge branch 'master' into markj-kernel-config
Add snp(4).
Merge branch 'markj-kernel-config' into markj-develop