7d6d0e7 Rebase to 2018 update 1.

Authored and Committed by jjames 6 years ago
    Rebase to 2018 update 1.
    
        
file modified
+1 -1
file modified
+11 -8