tidyng up based on feedback from PR
Merge branch 'master' of github.com:neo4j/neo4j