Fixed some board generation problems.
Merge remote-tracking branch 'origin/kenny' into origin/spencer