Merge branch 'master' into p3d

Conflicts:
	gdx/src/com/badlogic/gdx/math/Matrix4.java