Fix for issue #4182

As I am still very new to git, I pulled a real boner and deleted the entire branch from my local and remote git repos.  Permanently.  (Still can't believe I did that.)

Here is the merge error fix for the issue.  The change is exactly the same as request #4245.