Merge with EsotericSoftware Spine