7854cf8 rebase related patch too

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