diff --git a/commerce_kickstart.install b/commerce_kickstart.install
index 2688d849a9effe3e43439d148c091e60914cb14d..a1ce1363c77ed257dfd6424d18120910a3d89e9a 100644
--- a/commerce_kickstart.install
+++ b/commerce_kickstart.install
@@ -1133,7 +1133,9 @@ function commerce_kickstart_update_7216() {
  * Enable Inline Conditions (Needed by Commerce Discount).
  */
 function commerce_kickstart_update_7217() {
-  module_enable(array('inline_conditions'));
+  if (module_exists('commerce_discount')) {
+    module_enable(array('inline_conditions'));
+  }
 }
 
 /**
diff --git a/drupal-org.make b/drupal-org.make
index 6cac170b7c770a38c045bfbf0411278614129602..1c03a93376270cb57148af4bd44071dff7d233d8 100755
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -34,9 +34,9 @@ projects[views_megarow][version] = 1.0
 projects[views_megarow][subdir] = "contrib"
 
 ; Drupal Commerce and Commerce contribs.
-projects[commerce][version] = 1.7
+projects[commerce][version] = 1.8
 projects[commerce][subdir] = "contrib"
-projects[commerce][patch][] = "http://drupal.org/files/commerce-add-some-self-healing-to-order-calculate-total-1423204-5.patch"
+projects[commerce][patch][] = "http://drupal.org/files/undefined-hostname.patch"
 projects[commerce_features][version] = 1.0-rc1
 projects[commerce_features][subdir] = "contrib"
 projects[commerce_features][patch][] = "http://drupal.org/files/1402762_export_flat_rate_commerce_features-6.patch"
@@ -52,9 +52,8 @@ projects[commerce_autosku][version] = 1.x-dev
 projects[commerce_autosku][subdir] = "contrib"
 projects[commerce_migrate][version] = 1.1
 projects[commerce_migrate][subdir] = "contrib"
-projects[commerce_discount][version] = 1.0-alpha2
+projects[commerce_discount][version] = 1.0-alpha3
 projects[commerce_discount][subdir] = "contrib"
-projects[commerce_discount][patch][] = "http://drupal.org/files/commerce_discount-field_type_error-2035437-14.patch"
 projects[commerce_checkout_progress][version] = 1.2
 projects[commerce_checkout_progress][subdir] = "contrib"
 projects[commerce_extra_price_formatters][version] = 1.x-dev
@@ -63,7 +62,7 @@ projects[commerce_checkout_redirect][version] = 2.0-beta1
 projects[commerce_checkout_redirect][subdir] = "contrib"
 projects[commerce_hosted_pci][version] = 1.0-rc2
 projects[commerce_hosted_pci][subdir] = "contrib"
-projects[commerce_payleap][version] = 1.0
+projects[commerce_payleap][version] = 1.1
 projects[commerce_payleap][subdir] = "contrib"
 projects[commerce_moneybookers][version] = 1.2
 projects[commerce_moneybookers][subdir] = "contrib"
@@ -71,9 +70,7 @@ projects[commerce_moneybookers][patch][] = "http://drupal.org/files/commerce_mon
 projects[commerce_paypal][subdir] = "contrib"
 projects[commerce_paypal][version] = 2.0
 projects[commerce_backoffice][subdir] = "contrib"
-projects[commerce_backoffice][version] = 1.2
-projects[commerce_backoffice][patch][] = "http://drupal.org/files/commerce_backoffice_product-add-product-variations-view-1954150-4.patch"
-projects[commerce_backoffice][patch][] = "http://drupal.org/files/backoffice_order_template_for_admin_order_page-1847008-2.patch"
+projects[commerce_backoffice][version] = 1.3
 projects[commerce_message][subdir] = "contrib"
 projects[commerce_message][version] = 1.0-rc1
 projects[commerce_search_api][subdir] = "contrib"
@@ -96,6 +93,8 @@ projects[commerce_exactor][subdir] = "contrib"
 projects[commerce_exactor][version] = 1.0-rc1
 projects[commerceguys_marketplace][version] = 1.0-beta4
 projects[commerceguys_marketplace][subdir] = "contrib"
+projects[commerce_paymill][version] = 2.0
+projects[commerce_paymill][subdir] = "contrib"
 
 ; Other contribs.
 projects[bean][version] = 1.2
@@ -122,7 +121,7 @@ projects[connector][version] = 1.0-beta2
 projects[connector][subdir] = "contrib"
 projects[oauthconnector][version] = 1.0-beta2
 projects[oauthconnector][subdir] = "contrib"
-projects[inline_entity_form][version] = 1.2
+projects[inline_entity_form][version] = 1.3
 projects[inline_entity_form][subdir] = "contrib"
 projects[inline_conditions][version] = 1.x-dev
 projects[inline_conditions][subdir] = "contrib"
@@ -143,10 +142,8 @@ projects[token][subdir] = "contrib"
 projects[token][patch][] = "http://drupal.org/files/token-token_asort_tokens-1712336_0.patch"
 projects[eva][version] = 1.2
 projects[eva][subdir] = "contrib"
-projects[message][version] = 1.8
+projects[message][version] = 1.9
 projects[message][subdir] = "contrib"
-projects[message][patch][] = "http://drupal.org/files/message-fix-table-index-name-1941448-3.patch"
-projects[message][patch][] = "http://drupal.org/files/1983138-clone-field-instances-1.patch"
 projects[message_notify][version] = 2.5
 projects[message_notify][subdir] = "contrib"
 projects[migrate][version] = 2.5
@@ -171,7 +168,7 @@ projects[title][patch][] = "http://drupal.org/files/title-translation_overwrite-
 ; Search related modules.
 projects[search_api][version] = 1.7
 projects[search_api][subdir] = "contrib"
-projects[search_api_db][version] = 1.0-rc1
+projects[search_api_db][version] = 1.0-rc2
 projects[search_api_db][subdir] = "contrib"
 projects[search_api_ranges][version] = 1.4
 projects[search_api_ranges][subdir] = "contrib"
@@ -210,8 +207,8 @@ projects[lingotek][subdir] = "contrib"
 
 ; Base theme.
 projects[omega][version] = 3.1
-projects[omega_kickstart][version] = 3.3
-projects[shiny][version] = 1.2
+projects[omega_kickstart][version] = 3.4
+projects[shiny][version] = 1.3
 
 ; Libraries.
 libraries[colorbox][type] = "libraries"
@@ -239,3 +236,9 @@ libraries[chosen][type] = "libraries"
 libraries[chosen][download][type] = "file"
 libraries[chosen][download][url] = "https://github.com/harvesthq/chosen/archive/v0.9.15.zip"
 libraries[chosen][overwrite] = TRUE
+libraries[paymill][directory_name] = "paymill"
+libraries[paymill][download][type] = "file"
+libraries[paymill][download][url] = "https://github.com/paymill/paymill-php/archive/master.zip"
+libraries[paymill][download][subtree] = "paymill-php-master"
+libraries[paymill][overwrite] = TRUE
+libraries[paymill][type] = "libraries"