Use the right and/or operators in bindings
Merge remote-tracking branch 'upstream/master'