Wrap the context in a request to allow 'REQUEST' variable
use getSite() to look up the Plone site - solves various URL issues
Merge remote-tracking branch 'origin/master'