Merge branch 'master' of danielabrecht.ch:/var/cache/git/knw_133