Patches to faye/bec99cf876407dca7b5d3c5b8b89cb4db6c84e7e.
Merge branch 'master' of https://github.com/Legify/echtzeit