Leading space trimmed.
Merge branch 'master' into feature/bolt2

Conflicts:
	app/view/_listing-base.twig