bugfixes background
no message
Merge branch 'thomas_bugfix' into thomas_branch