Fixed compilation
Merge branch 'neo4j' into masterNeoMerge