Merged #504.


Reply to this email directly or view it on GitHub.