article -> scrartcl
Merge branch 'master' into koma
Merge remote-tracking branch 'martin/master'