allow orWhere and norWhere
Merge branch 'master' into ubuntu