Implement or: operator
Merge branch 'master' into hairy