Merge branch 'putty'