Merged in code from our subversion repository