Merge change If922a88c into eclair

* changes:
  Update version name to 2.1 and API to 7.