more syntax errors
Merge remote-tracking branch 'upstream/shape' into shape