Merge remote-tracking branch 'libgdx/master'

Conflicts:
	extensions/gdx-box2d/gdx-box2d/jni/Box2D/CHANGES