always embarrassing leaving debug comments in
Merge branch 'master' into bernd