Merge r8294-r8297, r8299 and r8302 from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8303 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689