Frederic Massart authored Sep 02, 2016 and Dan Poltawski committed Sep 23, 2016

Still not perfect, but better...

Conflicts:
	theme/noname/templates/columns1.mustache
	theme/noname/templates/columns2.mustache
	theme/noname/templates/columns3.mustache

Part of MDL-55071