Merge branch 'dev' into MOB-346
MOB-346: Fix broken display
MOB-346: Disable any outstanding markers from caption in gallery
MOB-346: try in a loop, yack
MOB-346:Enable links inside caption add a comment
MOB-346: Revert changes in Cite
MOB-346: Revert more stupid changes
MOB-346: Revert more stupid changes
Merge remote-tracking branch 'origin/MOB-346' into MOB-346
MOB-346: Too many empty lines
Merge pull request #2465 from Wikia/MOB-346

Mob 346