cda652 rebase patch

Authored and Committed by pbrobinson 3 years ago
    rebase patch