fixes #103
concurrency issue with branch selection
Merge branch 'master' into diff