Preparing for adding git-crypt support
Merge branch 'master' of https://github.com/schluchter/berlin-transport

* 'master' of https://github.com/schluchter/berlin-transport:
  Preparing for adding git-crypt support