Merge branch 'bcornwellmott-no_quote' into develop