Merge branch 've-sprint-11' into dev

Conflicts:
	extensions/VisualEditor/wikia/modules/ve/init/ve.init.mw.WikiaViewPageTarget.js