Merge branch 'jk/svn-color'