Merge branch 'master' into markj-kernel-config
cyclic is no longer used.
Merge branch 'markj-kernel-config' into markj-develop