Teddy rotation enhancements
Merge branch 'SKYFALL'