Merge tag 'afs-fixes-20180514' into afs-proc