Merge remote-tracking branch 'dh/afs' into for-davem