Temporarily back to Neo4j 2.0.2
Merge branch 'develop' into back_20
Back to Neo4j version 2.0.3