Including recent svn commits for dev branch into git dev branch.