Make checkout compatible with Hub
Merge branch 'checkout_compat'