Sync with skeleton cookbook

https://github.com/mlafeldt/skeleton-cookbook