Merge branch 'master' of ssh://gloo.fraboom.com/home/gloo/stage
Merge branch 'master' of ../stage