Replace || with &&
Merge remote-tracking branch 'master/master'