starbucks and betahaus hamburg
Merge remote-tracking branch 'upstream/pr/170' into gh-pages