We need 2.0 version of commerce_stock.
Fix dead link to colorbox.
Merge branch 'f-updates' into dev
Merge branch 'dev'