CJ-939

port of https://github.com/code-orchestra/colt-sublime-plugin/commit/3416463f065334b1e3c34f5ebe44b83fad14d4f6