3a9c95c
Update to 0.6.10 release from upstream. Sync up some differences between this spec and upstream's spec