Changes commited lan
Merge branch 'klaus' into 'master'