upgraded to Neo4j 2.1.6
Merge remote-tracking branch 'origin/master'