am d5a59aa7: am 1b2d214b: Merge "Clean up forking and cloning."

* commit 'd5a59aa767d4d87738b53995d73461be2778b9ee':
  Clean up forking and cloning.