Updated source code from upstream SVN