Merge branch 'master' into 18-incorrect-parsing-of-tuples-with-trailing-commas