Merged in tag v1.0.68 with a few local changes.