Merge upstream koa

Maarten de Waardrequested to merge
merge-upstream-koa into totem-theme

Merge upstream changes that went with the Koa upgrade into our theme

Merge request reports