Merge changes from SystemRescueCD 3.3.0