Bowercopy ace mode-coffee indent improvements.
Merge branch 'master' into geomshow

* master:
  Bowercopy ace mode-coffee indent improvements.