Merge in official Shimmie2 repo