Manually merging pull request #131.

[finishes #64486682]