Merge latest into ccp9 fork. There should be a better way.