Merge branch 'neo4j/1.9-maint' into master