Merge pull request #1632 from alexanderkyte/bug24118