Merge pull request #3739 from ethomson/0.24.1

Backport bug fixes to 0.24