Merge pull request #2 from libgdx/master

Update local branch