don't draw default boxes for empty frames
Merge remote-tracking branch 'upstream/master'