Fixes #2473.
Merge pull request #2475 from AshFurrow/master

Fixes #2473.