updated from citrus-commerce / casablanca