Merge remote-tracking branch 'origin' into md/blog

Conflicts:
css/includes/blog/_blog.scss