Configuration tidy
Merge remote-tracking branch 'origin/master' into feature/push_and_pull

* origin/master:
  Configuration tidy