Merge commit 'vlock-2.2-rc3' into vlock-2