prevent double horseshoe etc
Merge branch 'master' into production