merge upstream changes into fix_issue_157

more post-release housekeeping. Believe me when I say that I'm not sure if it ever ends.