merged changes from Kundera-Neo4j_Dev to trunk