patch-graphics-from-master: Be lenient with whitespace changes.
Fix typo syntax error in herbalism research reaction.

Thanks to Billy Jack for spotting this.
Merge branch 'master' into unified

* master:
  Fix typo syntax error in herbalism research reaction.
  patch-graphics-from-master: Be lenient with whitespace changes.