Added checkout support
Added checkout support
Added checkout support
Merge branch 'master' into 1.0