Merged r5715 and r5797 to testing branch.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@5798 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689