Commit b2c9e41ae43dbd6674abd38a17d87d690c80d43e

Vicent Martí 2013-10-16T13:51:24

Merge pull request #1702 from ethomson/checkout_merge Checkout merge