Speed-up: avoid unnecessary merge tests.
Speed-up: avoid unnecessary merge tests.

awakecoding/thor,tmatth/thor,volvet/thor,volvet/thor,tmatth/thor,awakecoding/thor,volvet/thor,cisco/thor,cisco/thor,tmatth/thor,cisco/thor