Merge branch 'master' into symbol-syntax