Merge branch 'staging' of https://github.com/dbt-labs/jaffle-shop