Merge in Fancy Kernel fstab tweaks.