Sync with latest changes

Can't friggin' wait for 1.3.1 with the new font renderer and colored
floppies