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