Merge branch 'master' into markj-kernel-config
Merge branch 'markj-kernel-config' into 20141021-gzio-refactoring