Merge: Keeter's fix to pcb size