Use "comparison" instead of "blinkDiff" for custom configurations in Kobold
Merge remote-tracking branch 'origin/master'