This change has been marked as completed.

Describe the completed change (optional):

Pushed to master (548a280). release-1.7.x didn't seem to have the original patch. Thanks!