b18872b Update history to reflect merge of #7015 [ci skip]

1 file Authored by jekyllbot 6 years ago, Committed by Pat Hawks 6 years ago,
    Update history to reflect merge of #7015 [ci skip]
    
        
file modified
+6 -0