pulled latest changes from jquery/odysseus

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>
Merge branch 'master' of https://github.com/vhv/BarbershopJs