updating master to svn 8642