Merge branch 'master' into assign-expr