Merge changes from SystemRescueCD 3.8.1