Merge remote-tracking branch 'upstream/master'
Fixed drop for site-wides
Merge remote-tracking branch 'upstream/master'
Merge pull request #284 from jerv13/master

Fixed drop for site-wides