Conflict Resolved
Merge branch 'develop' of https://github.com/orientechnologies/orientdb into develop
Fixed issue #2537