Fixes #2648
Merge branch 'master' of https://github.com/libgdx/libgdx