Merge branch 'master' of https://github.com/neo4j/neo4j
Merge branch 'master' into builtin-guide