Merge pull request #1663 from sebweb3r/lurch-patch-2

Replacement of #1652