Merge change Id703d6bb into eclair

* changes:
  Black is the new black