Merge remote-tracking branch 'libgdx/master'

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