Merge change I8e4697e1 into eclair

* changes:
  New layout optimization tool. Run layoutopt on the command line.