PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
directories. PR: 25849 Submitted by: Justin Stanford <jus@security.za.net>