Merged shimmie2 changes