Re: #1671
Merge branch 'neo4j' into masterNeoMerge