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