Note: Before submitting this pull request, please review our contributing guidelines.
Please describe your pull request.
NOTE: All patches should be made against master, not a maintenance branch like 3.1, 2.5, etc. That is unless the bug is already fixed in master, but not in that version series.
If it fixes a bug or resolves a feature request, be sure to link to that issue via (Fixes #4412) for example.