Merge branch 'master' into raise-exception-urchin