Merge branch 'kernel' of ssh://106.109.8.71/srv/git/dbi into kernel