Merge branch 'master' into array-context