Merge with libgdx/libgdx