Merge branch 'dev' into VideoSprint21

Conflicts:
	extensions/wikia/VideoHandlers/VideoHandlerHooks.class.php
Merge branch 'VideoSprint21' into bugid-98408