Merge branch 'neo4j/2.0-maint' into master