Downstream Changes for Package

Maintenance changes from @jamesward.