Add test documenting issue #473
Misc changes to prepare for 2.4.0 beta release
Merge pull request #488 from andrewcollette/issue_473

Add test documenting issue #473
Merge pull request #489 from andrewcollette/release_240_changes

Changes in prep for 2.4.0 beta