ctrl-s
Merge branch 'core' into mobile-upcoming-tiles

Conflicts:
	modules/styles.mod/styles/upcoming-tile.less