See #4091
bug #4093 See #4091 (dannykopping)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #4093).

Discussion
----------

See #4091

Commits
-------

5214cb4 See #4091