7854cf rebase related patch too

Authored and Committed by Rex Dieter 5 years ago
    rebase related patch too