by Stefan J., Laura B.
Merge branch 'master' of github.com:StefanTischler/Hugo