Final v0.8.x enhancements.
Merge pull request #287 from pelson/v0.8_prep

Final v0.8.x enhancements.