Closes #2136.
Merge pull request #2164 from AshFurrow/master

Closes #2136