Add spec for issue #1917
Fix issue #1917
Move 1.9 specific spec into a different file
Merge pull request #2495 from darkgrin/issue1917

Fix for Issue #1917