Merged in local svn diffs