gitignore
Merge branch 'master' into bindings

* master:
  gitignore