Merge pull request #1 from libgdx/master

update