Fixes #788
This PR has a merge conflict so I manually added the content in a099756.
Pull-Request has been closed by bcotton
Fixes #788