Fixed the deploy target being executed on feature branches
Fixes #6251
Merge pull request #6254 from wet-boew/fix-6251

Fixed the deploy target being executed on feature branches
Merge remote-tracking branch 'upstream/master' into changing-thumbnail-size