closes #2035
Merge pull request #2037 from timbrah/master

closes #2035