No more faith.
Merge branch 'markj-kernel-config' into 20141106-kernel-dump-refactoring