Fixed a bug where some resolver grid tiles wouldn't show up in Settings
Merge remote-tracking branch 'upstream/master'