Merge branch 'master' of http://git.chise.org/git/chise/ids into 3type-fix