Merge pull request #894 from dteirney/myth-0.25