Manually merged in #1895.
Merge pull request #1900 from pjackson28/master

Manually merged in #1895