fix(fonts): missing comma
fix(delegate): find delegate when multiple parent histories
Merge remote-tracking branch 'upstream/master'