Add regression test for #1555
Merge pull request #1556 from gfredericks/issue-1555

[DO NOT MERGE] Add regression test for #1555
Merge remote-tracking branch 'upstream/master'