Carry over from master - 7/30/2014
Checkout order overwriting bug fix
Versioning