bugfix for empty boards
Merge branch 'master' into jupis