Merge master into cypher-2.1