Master Merge Request - Mar 13th, 13

Includes enhanced command spotlight.