Merge branch 'master' into develop
Quotes api fix
Merge branch 'develop'