af102ba Update history to reflect merge of #6814 [ci skip]

Authored and Committed by jekyllbot 6 years ago
file modified
+1 -0