gitignore
Merge branch 'master' into enhanced

* master:
  gitignore
fix 3d multiframe handling that I broke