initial commit of upstream SVN r16