Merge branch 'ef/win32-cred-helper'