https://github.com/nuvolabase/orientdb/pull/1406

Fix https://github.com/nuvolabase/orientdb/pull/1406
Merge branch 'master' of git://github.com/nuvolabase/orientdb
https://github.com/nuvolabase/orientdb/issues/1226
fix https://github.com/nuvolabase/orientdb/issues/1226
Merge branch 'master' of git://github.com/nuvolabase/orientdb
Merge pull request #1430 from henryzhao81/master

https://github.com/nuvolabase/orientdb/pull/1406