Fix spaces that show up in two-deck mode
Merge branch 'master' into DJO-hacks-trunk