Squashed 'user/themes/antimatter/' changes from 9a75b13..2cb4375

2cb4375 fix for antimatter head endblock

git-subtree-dir: user/themes/antimatter
git-subtree-split: 2cb4375ffe084f0f33068aadf0e4c27c2c7b1171
Merge commit '2549b449e755dab43ca4bf9a1f57de5cf7800112' into develop

Conflicts:
	user/themes/antimatter/templates/partials/base.html.twig