am 7c7ca5ea: (-s ours) Merge "Add egit. DO NOT MERGE"

* commit '7c7ca5eac957b10a19475c1f82b5189e7438d40d':
  Add egit. DO NOT MERGE