ommit-from-shell
Merge branch 'master' of https://github.com/mstepan/incubator