VE-362: only display captions if not type frameless or none
Merge pull request #2662 from Wikia/VE-362

VE-362: only display captions if not type frameless or none