more factoring out
Merge branch 'master' of github.com:amorgner/neo4j-org into amorgner
Merge branch 'master' of github.com:amorgner/neo4j-org into amorgner