complete merge of skeleton

[gilesknap]

A merge of skeleton is underway in the master branch here.

This has not been pushed to gitlab internally at DLS yet.

TODO: verify this is working and get it updated internally too.

[gilesknap]

Update: you probably want to start this again as skeleton has had lots of churn since.