schierlm Merge branch 'svnmaster'