Merge branch 'master' of https://github.com/libgdx/libgdx into bufferutils
Merge branch 'bufferutils' of https://github.com/xoppa/libgdx into bufferutils