Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.