updated for next development iteration
Merge branch 'svn'