Merge branch 'canoe' into vlock-2