CON-1790 CR second round
Merge remote-tracking branch 'origin/CON-1790' into CON-1888

Conflicts:
	extensions/wikia/Venus/styles/article/article.scss