closed issue #3210 reopened #3151 (conflicting)
Merge branch 'develop' of https://github.com/orientechnologies/orientdb into develop