Dirty replace three hyphens with underscores
Merge branch 'master' of ssh://gloo.fraboom.com/home/gloo/stage