e6bc89d Rebase to 2018 update 4.

Authored and Committed by jjames 6 years ago
    Rebase to 2018 update 4.
    
        
file modified
+1 -1
file modified
+7 -9