Switch conditional to OR.
Merge pull request #350 from square/jw/or

Switch conditional to OR.
Merge remote-tracking branch 'upstream/master'