merge current trunk into vbo branch