Don't fail on detach
Merge branch 'master' into develop