My non-Rockies fork for upstream contributions