6.x-2.13
Merge branch '6.x-2.12' into 6.x-2.12-fix

Conflicts:
	uc_cart/uc_cart.module
tweak the legal after ubercart update