Merge pull request #137 from douglasbagnall/oid-regenerate