update ampersand-model
Merge branch 'master' into bindings

* master:
  update ampersand-model