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