Rearranged Toolbox panel
Catch up to trunk