Merge branch 'master' into scalpel-carver