Checks item_type, as well as item_id, when searching for a cart item for a specific object
Merge remote-tracking branch 'guillelopez/master'