Split one of the or criteria into two
Merge remote-tracking branch 'origin/master'