Merge pull request #1851 from dneelyep:patch-1