Fix Issue 1308.
Merge branch 'master' of https://github.com/libgdx/libgdx
Merge remote-tracking branch 'remotes/upstream/master'