Merge pull request #4516 from Wikia/VID-1945

Vid 1945
Conflicts:
	extensions/wikia/Thumbnails/ThumbnailController.class.php
	extensions/wikia/Thumbnails/ThumbnailHelper.class.php