Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maint