Fix for XSS vulnerability in CategoryGallery
Merge remote-tracking branch 'upstream/dev' into categorygallery-xss
Merge pull request #374 from TK-999/categorygallery-xss

Fix for XSS vulnerability in CategoryGallery