Merged master into VBO-testing.