pulled latest changes from jquery/odysseus

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>