[fix bug 1008927] Fix basket unsubscribing from /admin.
Merge pull request #949 from glogiotatidis/1008927

[fix bug 1008927] Fix basket unsubscribing from /admin.
Merge remote-tracking branch 'upstream/master'
[Bug 997345] Enable search by timezone