import from mercurial as of changeset: 9635:6d4158ff7b82
Merge branch 'master' into warped
Stubbing out the warped methods
fix file mode