Debugging change that should have been removed.
Fixing a layout issue on the Edit Menu
Reverting a previous change that was not fully committed
Merge remote-tracking branch 'upstream/master'