Hybrid Core 1.6-alpha
Better formatting in shortcodes.php