Merged in subversion code