Fixes #418 (closed)
Thanks. I'll merge it. It looks like a large commit for what appeared as a "small" issue.
Enabled an automatic merge when the build for 6aa3d33d succeeds
mentioned in commit f9856b36
Status changed to merged