Merge branch 't/grsecurity' into t/all
Merge branch 't/nixops-unstable' into t/all
Merge branch 't/vimrc' into t/all
Merge branch 't/xfs' into t/all