SVN 394
SVN 396
Merge branch 'svn' into ethernet