Merge change I1fa1ae88 into eclair

* changes:
  Move Tools to rev 5, and ADT to 0.9.5