Merge branch 'master' into tc/home-coworkers

Conflicts:
css/style.scss
functions.php
style.css