AiryBreath's 1.6.4 port for stable branch.