CJ-961

port of https://github.com/code-orchestra/colt-sublime-plugin/commit/93c3acb28649f11d2ad07beff3393888573c6290