merge current trunk into vbo branch
183 files changed