Merge branch 'master' of router:/srv/git/kaka/cakelight