2 1 stable

Merge Tux da Penguins branch into master.