Merge branch 'origin/fix/shipping_method_failure' into machtfit

* branch origin/fix/shipping_method_failure:
  Allow shipping_address being 'None' for an order
Merge branch 'add-no-shipping-required-to-default-repository' into machtfit

* branch add-no-shipping-required-to-default-repository:
  Make NoShippingRequired available by default.