Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next