Merge branch 'stable-6.1' into stable-6.2 * stable-6.1: Checkout: better directory handling Change-Id: I2f8e5410f4962d38bc6e822b5cda42df68aef32b