Merge branch 'connor' into connor-dev-scss