Merge pull request #248 from mochi/follow-up-247

v3.1.0