Add LogicalOr support in Persistence/InMemory
Merge branch 'master' into arrayObjectSupport