Add support for #two-one-b
Merge branch 'master' of ssh://gloo.fraboom.com/home/gloo/stage