EDM Mode: o.c.opibuilder: Fixed bug where shell wasn't raised to the top
Merge branch 'edm_clean'