bugfix due to categoryboards
Merge branch 'master' into jupis