Cleanup debug code, and embrace some other around a #ifdef block
ellipsize the text in comboboxes to avoid them to grew beyond the panel size
Merge remote-tracking branch 'upstream/master'