Merge pull request #4373 from NattyNarwhal/haiku