There should be one-- and preferably only one --obvious way to do it.
Merge branch 'master' into manager

* master:
  There should be one-- and preferably only one --obvious way to do it.