Neo4j talk: backport improvements from GC2013.