Merge branch 'develop'
small update to try 3 times on a bad request
Merge branch 'master' into develop